From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 27 Feb 2015 16:20:27 +0000 (+0000)
Subject: Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen into... 
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3707
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=226db8c65525e341bd94f5359b1d48aa81b9057f;p=xen.git

Merge branch 'wip.build-system-v5' of git://xenbits.xen.org/people/liuw/xen into staging

Conflicts:
	Config.mk

ijc -- resolved trivial conflict with 6dacedd707c2 "tools: update
       seabios rel-1.8.0"
---

226db8c65525e341bd94f5359b1d48aa81b9057f
diff --cc Config.mk
index 811485a570,109f1f1ef0..c0c0775c19
--- a/Config.mk
+++ b/Config.mk
@@@ -250,12 -251,17 +251,17 @@@ OVMF_UPSTREAM_URL ?= git://xenbits.xen.
  QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
  QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git
  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
+ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
  endif
 -OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423
 +OVMF_UPSTREAM_REVISION ?= a065efc7c7ce8bb3e5cb3e463099d023d4a92927
  QEMU_UPSTREAM_REVISION ?= master
+ MINIOS_UPSTREAM_REVISION ?= 55f7cd7427ef3e7fe3563a3da46d8664a2ed0d6d
+ # Thu Jan 29 19:10:04 2015 +0000
+ # Mini-OS: standalone build
+ 
 -SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
 -# Thu May 22 16:59:16 2014 -0400
 -# python3 fixes for vgabios and csm builds.
 +SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0
 +# Wed Feb 18 12:49:59 2015 -0500
 +# docs: Note v1.8.0 release
  
  ETHERBOOT_NICS ?= rtl8139 8086100e